Clean up vestiges of the OpenSearch system

https://bugzilla.gnome.org/show_bug.cgi?id=683583

diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
index 866732f085cc37dace025ce0c8ddf31e94a55016..d9a1ae858c9bd46cc71ce3456ee1f9a9946adf9e 100644 (file)
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@@ -39,10 +39,6 @@
         will be displayed in the favorites area.
       </_description>
     </key>
-    <key name="disabled-open-search-providers" type="as">
-      <default>[]</default>
-      <_summary>disabled OpenSearch providers</_summary>
-    </key>
     <key name="command-history" type="as">
       <default>[]</default>
       <_summary>History for command (Alt-F2) dialog</_summary>

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index d2bd3da79c43363976b8acb614d683837e8eb496..dee7e4c777db9ebd83611d4152ba195ebfd4fdb2 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -720,10 +720,6 @@ StButton.popup-menu-item:insensitive {
     spacing: 4px;
 }
 
-.search-providers-box {
-    spacing: 12px;
-}
-
 /* Text labels are an odd number of pixels tall. The uneven top and bottom
  * padding compensates for this and ensures that the label is vertically
  * centered */

diff --git a/js/ui/searchDisplay.js b/js/ui/searchDisplay.js
index 28e0255f8e0582542db00299d8e7513858f10c4f..d92eeb952bb8326caa1be4feae7f62bb4cfbc8cf 100644 (file)
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@@ -214,8 +214,6 @@ const SearchResults = new Lang.Class({
         for (let i = 0; i < this._providers.length; i++) {
             this.createProviderMeta(this._providers[i]);
         }
-        this._searchProvidersBox = new St.BoxLayout({ style_class: 'search-providers-box' });
-        this.actor.add(this._searchProvidersBox);
 
         this._highlightDefault = false;
         this._defaultResult = null;
@@ -302,9 +300,6 @@ const SearchResults = new Lang.Class({
             }
         }
 
-        if (!newDefaultResult)
-            newDefaultResult = this._searchProvidersBox.get_first_child();
-
         if (newDefaultResult != this._defaultResult) {
             if (this._defaultResult)
                 this._defaultResult.setSelected(false);